From: Owen Taylor Date: Mon, 3 Nov 2008 20:41:25 +0000 (+0000) Subject: Don't overwrite existing LD_LIBRARY_PATH when running g-ir-compiler X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~11613 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2ba8aaafca016a95d04f0f60c68ff95a71362cd4;p=gnome-shell.git Don't overwrite existing LD_LIBRARY_PATH when running g-ir-compiler When running g-ir-compiler, augment LD_LIBRARY_PATH with the current directory, rather than overwriting it entirely. svn path=/trunk/; revision=27 --- diff --git a/src/Makefile.am b/src/Makefile.am index 1ae6d1cb7..9aca09cc8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,4 +48,4 @@ Shell-0.1.gir: libgnome-shell-introspect.la $(libgnome_shell_la_SOURCES) # The dependency on libgnome-shell.la here is because g-ir-compiler opens it # (not the fake library, since we've already done the rewriting) Shell-0.1.typelib: libgnome-shell.la Shell-0.1.gir - LD_LIBRARY_PATH=. g-ir-compiler Shell-0.1.gir -o $@ + LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Shell-0.1.gir -o $@